Minor tweaks to build (regen deps, bump number, etc.) to release 1.3.2.

diff --git a/Makefile.in b/Makefile.in
index c6c6aff56d1163cad778510b5d756308a93b6f06..fcfc1a08ba112b977a6940b708f6079535ee03ab 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -98,7 +98,7 @@ WEB=@DOCDIR@
 
 all: gpsbabel$(EXEEXT)
 
-gpsbabel$(EXEEXT): $(OBJS) @GPSBABEL_DEBUG@
+gpsbabel$(EXEEXT): $(OBJS) @GPSBABEL_DEBUG@ Makefile configure
        $(CC)  $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
 
 gpsbabel-debug: $(OBJS)
@@ -190,7 +190,7 @@ WINFILES = gpsbabel.exe mingw/libexpat.dll win32/GPSBabelGUI.exe win32/gui-2/REA
 # in and tagged.
 #
 release-sourcecheck:
-#rjl   cvs commit
+       cvs commit
        ./chkdoc
        make clean
        rm -fr gpsbabel-$(VERSIOND)
@@ -296,7 +296,12 @@ cet_util.o: cet_util.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
 coastexp.o: coastexp.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h xmlgeneric.h uuid.h
 compegps.o: compegps.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
-  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h csv_util.h
+  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h csv_util.h \
+  jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
+  jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
+  jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
+  jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
+  jeeps/gpsproj.h
 copilot.o: copilot.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h coldsync/palm.h \
   coldsync/../gbtypes.h coldsync/pdb.h grtcirc.h
@@ -457,7 +462,7 @@ mag_pdb.o: mag_pdb.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
 magproto.o: magproto.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h magellan.h gbser.h
 main.o: main.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \
-  gbfile.h cet.h cet_util.h inifile.h filterdefs.h
+  gbfile.h cet.h cet_util.h inifile.h filterdefs.h csv_util.h
 mapsend.o: mapsend.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h mapsend.h magellan.h
 mapsource.o: mapsource.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
@@ -513,8 +518,8 @@ queue.o: queue.c queue.h
 quovadis.o: quovadis.c quovadis.h defs.h config.h queue.h gbtypes.h \
   zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
   coldsync/palm.h coldsync/../gbtypes.h coldsync/pdb.h
-radius.o: radius.c defs.h config.h queue.h gbtypes.h cet.h cet_util.h \
-  inifile.h filterdefs.h grtcirc.h
+radius.o: radius.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h filterdefs.h grtcirc.h
 reverse_route.o: reverse_route.c defs.h config.h queue.h gbtypes.h \
   zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
   filterdefs.h
@@ -572,7 +577,8 @@ tpo.o: tpo.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \
 trackfilter.o: trackfilter.c defs.h config.h queue.h gbtypes.h \
   zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \
   filterdefs.h strptime.h grtcirc.h
-transform.o: transform.c defs.h filterdefs.h
+transform.o: transform.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h filterdefs.h
 unicsv.o: unicsv.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h csv_util.h \
   jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \

diff --git a/configure b/configure
index be7c1e896885e179de45ccd6245d7386d8f5cab3..9b7086aaabe933a7d8217130341d52277bee215c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GPSBabel 1.3.1.
+# Generated by GNU Autoconf 2.59 for GPSBabel 1.3.2.
 #
 # Report bugs to <BUG-REPORT-ADDRESS>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GPSBabel'
 PACKAGE_TARNAME='gpsbabel'
-PACKAGE_VERSION='1.3.1'
-PACKAGE_STRING='GPSBabel 1.3.1'
+PACKAGE_VERSION='1.3.2'
+PACKAGE_STRING='GPSBabel 1.3.2'
 PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
 
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE_RELEASE GBMAJOR GBMINOR GBMICRO build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE  FILEINFO RC LIBUSBCONFIG USB_LIBS USB_CFLAGS OSJEEPS GBSER ZLIB EXPAT_LIB EFENCE_LIB GPSBABEL_DEBUG INSTALL_DEBUG DOCDIR LIBOBJS LTLIBOBJS'
@@ -738,7 +738,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GPSBabel 1.3.1 to adapt to many kinds of systems.
+\`configure' configures GPSBabel 1.3.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -800,7 +800,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GPSBabel 1.3.1:";;
+     short | recursive ) echo "Configuration of GPSBabel 1.3.2:";;
    esac
   cat <<\_ACEOF
 
@@ -929,7 +929,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GPSBabel configure 1.3.1
+GPSBabel configure 1.3.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -943,7 +943,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GPSBabel $as_me 1.3.1, which was
+It was created by GPSBabel $as_me 1.3.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -3812,7 +3812,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GPSBabel $as_me 1.3.1, which was
+This file was extended by GPSBabel $as_me 1.3.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3872,7 +3872,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GPSBabel config.status 1.3.1
+GPSBabel config.status 1.3.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index 30125b2a8938b561066d54433673ea99e83098ed..55b9aa081e8185f5e847f4f65ce2ebb07257ecba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT(GPSBabel, 1.3.1, BUG-REPORT-ADDRESS)
+AC_INIT(GPSBabel, 1.3.2, BUG-REPORT-ADDRESS)
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
 PACKAGE_RELEASE=""

diff --git a/tools/.cvsignore b/tools/.cvsignore
new file mode 100644 (file)
index 0000000..bff3bd0
--- /dev/null
+++ b/tools/.cvsignore
@@ -0,0 +1 @@
+mkcapabilities

diff --git a/tools/gcfg b/tools/gcfg
new file mode 100755 (executable)
index 0000000..031c208
--- /dev/null
+++ b/tools/gcfg
@@ -0,0 +1,17 @@
+# Script to configure cross build suitable for inclusion in Earth.
+S=.
+LDFLAGS=-s \
+CFLAGS=-DXML_UNICODE \
+CC=/usr/local/cross-tools/bin/i386-mingw32msvc-gcc  \
+$S/configure --host=i386-pc-mingw32 \
+        --without-zlib \
+  --disable-shapefile \
+  --disable-pdb \
+  --disable-csv \
+  --disable-filters \
+        --without-cet \
+        --without-pdb \
+        --without-filters \
+        --with-expathdr=$S/mingw/includew \
+        --with-libexpat=$S/mingw/libw
+

diff --git a/tools/mkcapabilities.in b/tools/mkcapabilities.in
index 172b12adf58b9c1c06509d5a7f7a504d43d6505c..44fd8bb8474e69962b13ecb015b129aa3f524311 100755 (executable)
--- a/tools/mkcapabilities.in
+++ b/tools/mkcapabilities.in
@@ -1,3 +1,6 @@
+#
+# mkcapabilities.in is used to create mkcapabilities.  
+#
 ./gpsbabel -^2 | sed 's/\&/\&/' | awk  -F'\t' '
 function getcap(type, cap, sname, lname) {
        if (type == "internal") return

diff --git a/xmldoc/.cvsignore b/xmldoc/.cvsignore
new file mode 100644 (file)
index 0000000..b4dd115
--- /dev/null
+++ b/xmldoc/.cvsignore
@@ -0,0 +1 @@
+makedoc

diff --git a/xmldoc/makedoc.in b/xmldoc/makedoc.in
index 7653f534227c41b33ec0548ec5583230a2335004..cf3b354eaaaf2771c5b650f722b91004221d39d3 100755 (executable)
--- a/xmldoc/makedoc.in
+++ b/xmldoc/makedoc.in
@@ -1,5 +1,9 @@
 #!/usr/bin/perl
 
+#
+# makedoc.in is used to generate makedoc.  
+#
+
 sub expandrw {
    my $read = shift;
    my $write = shift;